Merge "Re-enable API checks for the CorePlatformApi"