[automerger] Bug fix for flush without valid frames am: 10c1176f1b am: 54fe392964 am: 6261ed297b am: 051d4fb2dc am: 1863b7cc03 am: e6d4971fdb am: 309f184ed5 am: 99015cf2e6 skipped: eb9952c5f1 am: 8788730e4b am: 7ff5530ec9
am: 5703c42e4c

Change-Id: I2bba948053d9eff2ed3752849414ffec36ac3996