Merge changes Iea55330d,I547319f2
am: 7369c92fbc

Change-Id: Ifd6f0793f94942c845a2f969e35dda980456b3d1