Merge changes Iebd8d368,Ibdf24604 into rvc-dev am: 67e6a453f7 am: c4fdd14b0c am: edc395980f

Change-Id: Ifa925397a159f3661ce4113a8bfc1f6acf27e78a