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

Change-Id: Id9bf642ea3d5105efbfa4663ced5c6f660e0fd7f