API change
Merge bug25466