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

Change-Id: I1fbf4c51536d8b759988b7869e3762854d832aa0