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

Change-Id: I421a40de8a7c3aee6ea087a12c6862b8051765a9