Merge "Remove all non-public resolver APIs"