Merge changes I1dac2f1c,I656f4cd2,I03fb2cb2
am: a741f4b5e5

Change-Id: I08eb4563ea389ff5730dd91c5245114d7b7ed1ac