am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."

* commit 'c840ec9eb7b905f50eee67f9b9d8154a45d2283a':