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: b653777a
am: 5c5663e7
Change-Id: Iae69ca63ce98af1dc3811eb4bac8060272e05f91