Merge changes Id53e0f04,I2685724d,If871a20b am: 4d0e6b56c2
am: 4a60be803b

Change-Id: I99cabe4962c05ce2485a30833cafdb47221365b6