Merge "test: Make 079-phantom less flakey."