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