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

Change-Id: I436715dc13b9b9e8abc8d5c84d04e1e203269e7a