Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev
am: e39fa5ef8f

Change-Id: I5918c7dfe27bb9b3c7aff031d79d961b08c3b711