Merge changes I80f66d19,I68810035 into rvc-dev am: 8d974dc239 am: 0e2a7a1cf7 am: f9e08db240

Change-Id: Icc4bdfd78edcf335748daad5534b96badd104818