Update tests.
Merge bug26192