Merge changes Iec082f0c,I86a479af
am: 52cc4a4321

Change-Id: Icd2d306b31122ed20801786897f21d3e9f1844ba