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

Change-Id: I5edc9b3b2da7f1f913a1320ca3945b65293bf6e2