Merge changes I97efd6c9,I6460f8f0,Ic67e4290,I16214514,Ieaa4e463, ... into nyc-dev am: 6cfb89c
am: 4a842c7

* commit '4a842c78b890b0f14090836f25e5e346aa93d930':

Change-Id: Ib4554666a359704d65848d247f49e55a4c06433b