Merge changes I65bc7769,Ib24c7060
am: d74bd3a9a4

Change-Id: Ic6e0297261b9774b3f58ed1211fa5059d0384062