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

Change-Id: Ibd65acb3016732e53b25cb4aee2ec58076f6340f