Merge changes I0ca13626,I3677ce54 into nyc-dev
am: bbcb733d80

Change-Id: I1ab5db3410322ea9880ad4bce9b78b8355c0f2ce