am 8781fd99: Merge "Fix 3 broken unittests."

* commit '8781fd9908e467d3564d47f2cfbae384ca49fb0c':
  Fix 3 broken unittests.