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