Merge changes Iada825d7,Iaa056018 into rvc-dev am: 1718db1f09

Change-Id: Ie6f5fbba56cc1127f1f321a211d25c466eeab9c7