[automerger] Bug fix for flush without valid frames am: 10c1176f1b

Change-Id: Ie26a4e3f41ab437f9d41bddb0a1166274fc3a261