Merge "Fix categories and intro." into nyc-dev am: 1c7d75742e am: 0012cf46fa am: 123b09df94
am: 592a64d2f7

Change-Id: Id5881dc85e2d53e772a684e0f3e4692b90a46e18