Merge changes Iebd8d368,Ibdf24604 into rvc-dev am: 67e6a453f7 am: 9ed3c26d55 am: b15205c26c

Change-Id: I7c6a5a0ee3dd6cf54380b3e5c8aad4727930dba8