Merge changes I1dac2f1c,I656f4cd2,I03fb2cb2 am: a741f4b5e5
am: 2790ea6e81

Change-Id: Ic68dba061058d6f6617ab6201200533603d1a340