Merge "Update some APIs to System and Public"