Merge changes Ic9258141,If4b32546
am: 643af28f1d

Change-Id: Id8222d4f40996c578d8da03c1e25aaa2c61a2fa9