am 84bfbe14: Merge "Fix broken tests."

* commit '84bfbe14f708cdbc2ef310a5b8973be6911602b5':
  Fix broken tests.