Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev
am: fc0bc7bf96

Change-Id: Ib71dafd15bb5b6fb16cb44fd0fa659b2f100118e