Merge changes Id6c00c76,Ibc74a12f am: 32f5ff0dae
am: 488bb930e5

Change-Id: Ic00ecb1a5177b9ce5331114360e51d336220bc03