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

* commit 'fa490b78df732f484475e214eec033f89c5b40b7':
  Fix tests on jenkins