Merge changes I8c12e8e6,I4878993a am: dd6a7b3174 am: a6809eddaf
am: a1e5a0c78c

Change-Id: I6d803ef3746ca9532aaf218dc40cb3b88409f2f5