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

* commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
  Fix tests on jenkins, take 2.