[automerger] Bug fix for flush without valid frames am: 10c1176f1b am: 54fe392964

Change-Id: Ie3423ba1be63c8a26a05d0c1c7ca1c0281ed95ca