Merge changes I7c542db9,I6f809ce2 into rvc-dev am: dc1fe78978 am: 55391e9b1e am: 96748c7071

Change-Id: Ib8197566bc7a7f9710b34523e3c67044f4559953