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