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

Change-Id: I74478f32beb3cc5014f90740f3a8838f67b7cd6b