Merge changes I5b1a1ce0,I483a18f9 am: 9349b72a67 am: 4cd2da28ff
am: 1bd50f6a98

Change-Id: Ifeb41c75fcb63be27e96a40593a479c891b36d60