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

Change-Id: Ice4cf463c0637072203c46d03eaab81de2758dd2