Merge "test: Make 079-phantom less flakey." am: 8ea2074689
am: ce32cfb12c

Change-Id: Id3c3bf0d32e5b466d462f3b638196429e0a63fb3