Merge changes Ibd8ce581,I04cc955d into rvc-dev am: 0081f25310

Change-Id: If6056da85bf419338c75b1782d8a2e45ac22a883