Merge "Keep a removed API to not break GCore presubmit" into oc-dev