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

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