Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into nyc-dev am: 77bae40d am: 3d624f58 am: fe495ecd am: 986a19e3 Change-Id: I17f664bc8effc6cc459ccb288541feea25ece5f7