Merge changes Ibff278a6,If6d537a3
am: ecc6fad658

Change-Id: If1d215b0fae85bfeeb5b6190abf4e4dc841912e5