am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
automerge: 0b1188e

* commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
  Fix tests on jenkins, take 2.