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

Change-Id: Ic0d9ad184576d75ab7320eb4780c00c481bc7ed1