am 7f9582ce: am 48603a39: Fix tests on jenkins

* commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5':
  Fix tests on jenkins