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

Change-Id: Ia70e8bd5134e5898dcd9cdf4482e534ade45c718