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

* commit '7252230d33cf072b8cd053918a620518b8721117':
  DO NOT MERGE Revert "D.N.M. Revert "Display annotations and annotation values when they are requested""