Merge \\\"Fix code tags that contain html encoded characters, and fix at...
Merge \\\"Fix code tags that contain html encoded characters, and fix at links.\\\" into nyc-dev am: fc0bc7bf am: dd756c26
am: c6b2cce5
Change-Id: I8630c5a63550fcf1313ec78d5aef60c6a73d648c