Merge changes Iec082f0c,I86a479af am: 52cc4a4321 am: 30a1749f8e

Change-Id: Ibf943b652da9c94aedd8c58952cf84b90e7bdca2