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

Change-Id: Icbbd45733c2699b76e87f73474ceae5450e21bd7