Merge "Replace dependency on core.platform.api with core_current"
am: 2562545990

Change-Id: If7e6ce11c4dc30cc1b47bd0576ab668bd721a379