Merge changes I758270b8,Ic08b2b06 am: fbbb808b2a am: f6ac8fca82

Change-Id: I69688fdbc66f9d45d1985be5aeaf236ff326177a