[automerger] Bug fix for flush without valid frames am: 10c1176f1b am: 54fe392964 am: 6261ed297b am: 051d4fb2dc am: 1863b7cc03 am: e6d4971fdb

Change-Id: I24d6ff4f49063c54f1326e0280caea4ed636c5d9