Merge changes Ia9b1d24c,I86980cd2
am: 5f1f3557aa

Change-Id: Ic92feb43fe375996f550674044c5ecb26448ee8a