API change.
Merge bug26100