Merge changes Ide2ae854,I71ca710e,I90a80a7a,I05e82f06 am: e0505bfec4

Change-Id: I24d6d94b148b5f5a38c3251209e1a6ee1183766d