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

Change-Id: Ic790376f6c20363277c3455269cd12913d28016a