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

Change-Id: I71462b5bb4303e70920a4fc92a24390dce212177