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

Change-Id: I836923c5188a8b7090f8d0afa76de02f501df147