[automerger] Bug fix for flush without valid frames am: 10c1176f am: 54fe3929 am: 6261ed29 am: 051d4fb2 am: 1863b7cc am: e6d4971f am: 309f184e am: 99015cf2 Change-Id: I1fbf4c51536d8b759988b7869e3762854d832aa0