Merge "Fix categories and intro." into nyc-dev
am: 1c7d75742e

Change-Id: Iad6efcc58a7f3c63088edced86d1c4180d1ec3f9