am c7c1d7ab: am b6c37c99: Merge "Update test expectations."

* commit 'c7c1d7ab952c7db4c774c451fae294210e77dd89':
  Update test expectations.