Merge changes I40a11748,I5e56f17f,Ie3748b6c,I4e1d56a8 into nyc-dev am: d4af0d64de am: dc3d0b7175
am: 3c1af3c431

* commit '3c1af3c43157ed077300f87cb0b0b9b796ba7eb5':

Change-Id: I83141eec7248fa0269ded87394b1ee65a13af9b2