Merge changes I8c12e8e6,I4878993a am: dd6a7b3174
am: a6809eddaf

Change-Id: Iece59664c9c0d3f53d3bbbd9fda1074f5b561f16