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

Change-Id: I0ede3da990d3e27ed621ba8c886d05b0a560c3bb