propagate API change, plus cosmetics
propagate API change; and some cosmetics
Merge bug 25495