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

Change-Id: Iaa537fab4e4aebd274276975c86a27149df2fca2