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

* commit '2c6760a0eb1e05d3a89a6cca9d2746da3d547e9e':
  Remove AnnotationAccess and its remaining uses.

Change-Id: I40401184b8576440585d6e1c4f7d138965887c30