Merge changes I29ce7659,I2d6310a2,Ic4b29409,I6c5c970f into nyc-dev
am: 3952c3a2d4

Change-Id: I6647a1410723a229a7ac6ebf89d4495cb508efd9