Merge "Remove 3 APIs from @CorePlatformApi"