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

Change-Id: Ie7de3331faadcc55561869dc621085d2b1a9e401