Hammerhead: One last potential fix for overlay

Change-Id: I2aaf71902165eaee4938bfef86e72c8752afc3f2