Merge changes Iba4cb348,I51c43230,Iae90c4a1,Ica43ee8a
am: cda934e3f8

Change-Id: I24c18e689883c56bbc0598b58fbf0aac36b023c5