Merge changes I59024a0a,Iafd12e5a am: 19377a55c5

Change-Id: I11e0c744eade40f2c270e9241863e94ec22f84a0