Merge changes Ic8b33ce8,Ied6f13e5 am: 1ccd01feb7
am: 5df11f46ee

Change-Id: I4c7c6b2626aec1e453ae78de55039b289710697a