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