Merge changes I082e9bb7,Ib35fe4fc,Ibc2726e1 am: 22975f3ef9 am: 53c06d4d23
am: ad06c85c4e

Change-Id: Ic767e4dfb17b72956582989984b0adb9be98208d