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

Change-Id: I906743944b80516ed22653c9ffbeb0f6853b21e0