Refactor: use AnnotationKeys

Change-Id: I972b2816272cab2a6cb66f6df99f4dbe84198367
2 files changed