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

Change-Id: Ia3bab77ec69cb979638300efe2d8ac4cb6b69945