Merge changes Ic1a5d032,I271e7f4d,I7af37281 am: bd34fd3c83 am: 22785b5231

Change-Id: If59fd7e540dbb2fa49cb10e5193ad3b5e044b39e