Merge \"Adding projec.yaml files to all top/sub categories.\" into nyc-dev
am: 5a76378471

Change-Id: Ibf98357a67297ee6bb20d58d2c1063917aa5c7b1