Merge changes Ia8f83a53,Ia1f6a659 am: 68f2e9cf1b am: b71ac7f83c

Change-Id: I98ec115e2025ce5f9812f35292318d907153b8ed