Merge changes Ia26b07f0,Id3d2758c
am: 5ed51e3176

Change-Id: If78d17107d3c93b14ed7226b55bad3a55dc811a0