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

* commit 'dc3d0b717524d358ed1a651a2f226f1eef01c6a4':

Change-Id: I305a782f2b163718ec913fd1c8424595778ea362