Merge "Add CorePlatformApi to intra core api"