Merge changes I5b05e23a,I9350b250,I1d66b42a am: 393a1fd02f am: c622290608
am: 7616205286

Change-Id: I2f04e61f90478ff433677e5cec11a5841f334f28