Merge "Revert "Revert "Refactor annotation code for obsolete methods.""" am: ef62210a14 am: 6dece26102
am: 279ce63f7c

Change-Id: I6355aecb4ea93607f4eccaec11006b47698e6496