am 2d9cd63c: Merge "Tests still failing on buildbot\'s devices."

* commit '2d9cd63ca365331d02e3030c3ff799737a6f178a':
  Tests still failing on buildbot's devices.