Merge "Revert "Refactor annotation code for obsolete methods.""
am: 279aa660f4

Change-Id: Icd1996905857163aedbf27ee9fb092dfc079a75d