DO NOT MERGE Revert "D.N.M. Revert "Display annotations and annotation values when they are requested""

This reverts commit 846e46861b23124b3360bac9bdc3ec587aaf60a5.

Bug: 22723877
Bug: 8440225
Change-Id: I2242e0373e8073f589f88bc0eecdb7a72e376bc7
3 files changed