[Predictive Back] Clean up flags

Fix: 270614790
Flag: NONE - clean up flag
Test: presubmit
Change-Id: I956ce6067dca5d2517b45046ae8a392df1023e49
3 files changed