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

Change-Id: I3ad7a07d2ef6001b4632b83d7e8822a33e1190fd