Merge "Remove two unused CorePlatformAPIs."