Merge changes I069e2b7e,Ic5e9e58a into nyc-dev am: f4de8dd77c am: 2c21b5b651
am: be84d6da6c

Change-Id: Ieedb39cccef5223b1ef914d8f4f795e42861d8ae