am 2458f2b1: am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins

* commit '2458f2b12b5ec266538b2019b0f14fca4e772bdf':
  Fix tests on jenkins