API changes.
API changes.
Merge bug26469