Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
am: 114c09498d

Change-Id: Ie7f79a9236823a9066867fb52bf352523730ec3f