[automerger] Bug fix for flush without valid frames am: 10c1176f am: 54fe3929 am: 6261ed29 am: 051d4fb2 am: 1863b7cc Change-Id: Ibd65acb3016732e53b25cb4aee2ec58076f6340f