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

Change-Id: Ib1151792b61538845cc92d68efcf22eb70f5f69e