Merge "Remove usages of core_platform_current"