Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev