Merge "Fix handling of @removed APIs." into oc-mr1-dev am: 1100052bd4
am: f394eff14b

Change-Id: I233d82e529c50cbecc4e2962e1a90f382e88c5de