Merge changes Ic1a5d032,I271e7f4d,I7af37281 am: 775babe0c6

Change-Id: Ia1ec0ddbe841536f6525a9b5579603af620dae56