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

Change-Id: I93b2ea5d5049413795f21444a089f391ec6c2d37