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

Change-Id: I2877b1f130d05a024e6497f69346f8e641763537