Merge "Make remaining UCE related APIs @SystemApi"