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

Change-Id: I7efecf83d1ebb192f755db1dbee97d3e129e1133