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

Change-Id: Ifb64e09133d53fa9f52c92d8c4cc86e846d5f8b9