am b6c37c99: Merge "Update test expectations."

* commit 'b6c37c99b1f8b4a6b047076d71036af08f5d2fd1':
  Update test expectations.