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

Change-Id: If7999ffbf08692166f738994d7e655ba271e04d0