Merge \"Merge \\\"Fix code tags that contain html encoded characters, and fix...
Merge \"Merge \\\"Fix code tags that contain html encoded characters, and fix at links.\\\" into nyc-dev am: fc0bc7bf am: dd756c26\" into nyc-mr1-dev-plus-aosp
am: b27502cf
Change-Id: I14d2f94009742a853c866608ae36916996a7975b