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

Change-Id: I0bee12de83f9262afc89459c33d0f450d02e8065