Merge changes I0ca13626,I3677ce54 into nyc-dev am: bbcb733d80 am: 20367dbd3b
am: 3ada4842b2

Change-Id: I8fd4ce070667157371e18e15c2e145f1938aa0ab