Merge changes Iec53a9fd,Iac4cfe70
am: 29afcf0eb0

Change-Id: I8fae2c4d23d6e904b473b1e906094f997c8e446c