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

Change-Id: I2b137dcc2a6e5d3fbef73cc300b259557bc452b3