Merge "Refactor annotation code for obsolete methods."
am: 875e3225c5

Change-Id: I814f3b9d02231ca610f1c3d5c56a8714a634385f