API change
Merge bug26000