Merge changes Iada825d7,Iaa056018 into rvc-dev am: 1718db1f09 am: b240a1e925 am: 16382b599e am: ae92b74e95

Change-Id: Ie8f1aaf3591b3af3206bbdc77bce0347a585ce14