Merge changes I9ea20221,I81b7546c into rvc-dev am: 0f1eb7d451 am: 957aa82108

Change-Id: Ib5cb71542cc720507dcf813b40b384aeaf59c205