API change
Merge bug25778