Merge changes I082e9bb7,Ib35fe4fc,Ibc2726e1
am: 22975f3ef9

Change-Id: I0ce21b519ed456322f8532e34c800c08bdec3d7a