am e6f74816: (-s ours) am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit 'e6f7481631c1fd7a0d36d4515cf56f6c64e48267':