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

Change-Id: Ib4e0a75117044599c72de287039c60f0391788c2