Merge "Remove AnnotationAccess and its remaining uses." am: 2c6760a
am: 5b2f8e0

* commit '5b2f8e07a1859762c30c3a1f792594c34ffc0b18':
  Remove AnnotationAccess and its remaining uses.

Change-Id: Ib9ebea19b91f5ba3345b372ea50b8391e01ce8b3