Merge changes I0ca13626,I3677ce54 into nyc-dev
am: b99e19c729

Change-Id: Ied2e9dd7c4b3cd474f00018401e49f061a43a4cf