Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev