Merge changes Icd2e9bc0,Ibe241c0b
am: b5f062bde4

Change-Id: I24c62da81c0f9adff7eec3dab1c790eaf1f287af