Merge "Remove dependency on stable.core.platform.api.stubs"