Merge "Remove unnecessary classes from CorePlatformApi"