Fixed the annotation display format.

BUG=
R=alanknight@google.com

Review URL: https://codereview.chromium.org//268673009
Merge remote-tracking branch 'upstream/master' into angular-skin