Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea
am: d127bdc14a
am: f91d67428e
am: bc089d4171
Change-Id: Icc858f850673fa55bc3576f6667e53011da8918c
This commit is contained in: