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

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