Merge "Replace dependency on core.platform.api with core_current"