DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""

This reverts commit 2d20e3d9680757109981d66c25976fa66b46ac81.

Bug: 22723877
Bug: 8440225
2 files changed