Propagate API changes
Update tests
Backed out changeset 711e4ecf2794
Updates
Propagate API change
Merge bug25494