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