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

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