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

* commit '7dca1eda7fe6ad13f942927c4bccefd540cc00ea':
  Tests still failing on buildbot's devices.