Merge changes Ief3dbf8e,Ib06e6f65 am: ee0e63f71d
am: 12ac0c75ac

Change-Id: I52acef692341381cf8e0f6e07e9f0b2fd9535d63