Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into nyc-dev
am: 77bae40d84

Change-Id: I9542c95e4f9f28c1a0d8d0372a49ebbf80ec6c19