Merge "Refactoring to support more annotation types."
am: e1cb52f93d

Change-Id: I79e83032d08e9ec03f77442cd6d60495fec55704