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

* commit '6e88fe80e84788cdfcb93a9f599eabea06ef78fd':
  Remove AnnotationAccess and its remaining uses.

Change-Id: I8264e98ac7909114b7d014b112ddf3da21a304b2