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

Change-Id: I4c63613a3826877ee366df94d8df78ddc11bbefe