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

Change-Id: I7202090a1a21b9b9d78a87965f52219edb9f79bb