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

Change-Id: I20d78191cdd4fd185a62fcfd348385feb67e2b7a