am 7ade4d5d: am 274a19e4: Display annotations and annotation values when they are requested (cherry-picked from commit 6fa3e41df1664e59c13830b012b9be39c2b31cae)

* commit '7ade4d5df9fb36a86775210c1c6f0815c286dfda':
  Display annotations and annotation values when they are requested (cherry-picked from commit 6fa3e41df1664e59c13830b012b9be39c2b31cae)