Merge changes Ia154343c,Idff45359,Ia5ee9865 am: e47d6dba08 am: 8ecf7cc64b
am: e4e2001145

Change-Id: If1b29b48331aada067181526dde776b8a36de9bd