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

Change-Id: I7f677e9907d2867fa3563d977e566f19fc9a58d2