Merge changes Ieddc1113,Ia12217b3
am: 2c681345e8

Change-Id: Icce62013f0828569c78b3aad41a8d7180806bd16