Merge "Remove unnecessary UCE APIs because some of UCE APIs change."