Merge changes Iebd8d368,Ibdf24604 into rvc-dev am: 67e6a453f7 am: c4fdd14b0c am: 234535558c am: 3a5e6fc9ec

Change-Id: Iae2ea7533a7e0793c326b0a69cf3eca9e1f6b982