Merge changes I23545586,I0512c71e into rvc-dev am: c02e0d8c am: 2502b215 am: 2156d06f am: adc40285 am: 5b1ac6c6 Change-Id: I1fd2f1208d797dfce2a93e58d02559a321ba6bea