Merge "Fix handling of @removed APIs." into oc-mr1-dev