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