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

* commit '149f39c0aaa4bbe655874d3e7904ffe36005612a':

Change-Id: I4b7fe3b9751ca003ba4a77f4915bbf60867d52ad