Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea
am: d127bdc14a
am: 727aa42a94
am: 0d58f34da4
Change-Id: I203c75ee1434bc6dca85debcd90de6789004036e
This commit is contained in: