Merge "Remove dependency on internal libcore method"