Merge changes Id6c00c76,Ibc74a12f
am: 32f5ff0dae

Change-Id: Ib39d02ba88e4816ce73b43de0660041940906de9