am 10fdc6af: Merge "Fix various test dependencies."

* commit '10fdc6af15a8464fd10bd558a19f6395cf12345a':
  Fix various test dependencies.