am 23ace30f: Merge "Issue 28264: Handle adding annotations from markers outside of class"

* commit '23ace30ff0d20f23524f527eb6cbd0a97c2bfdbd':
  Issue 28264: Handle adding annotations from markers outside of class