Merge changes Icd1b1e57,Ib9c6b9b4 into rvc-dev am: 898dda3919 am: 16024fbfde

Change-Id: I04f43f2b61fb0c28ce30f5c7e5d3fe67f189e24b