Merge changes Ia4a2ff77,I970806e3,I47daa338 into nyc-dev am: a9e818f463 am: 149f39c0aa
am: bd596375f6

* commit 'bd596375f637a352ddc0c0e98fefafb14a0b06a7':

Change-Id: I7b584e4d254cf520d0505f09ec504f5e920b39d1