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

Change-Id: Ibca3d78dd46273d4325fcb0af8a1de901de0482f