
This implements the production change I98c80f657f38c5e1ed5f28e5d36988a3429ad1f8 in the test role. Review comments should be left there; we can merge this and then parent a job to base-test to test it. Change-Id: Id91350ff1c531fd7266f3bf76681a8415941481f