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

Change-Id: I091b02f996c1d9d2ff204d575697ea4057e8ffca