Merge "Revert "Revert "Remove a misleading "flush" function.""" am: d9bce3cfff am: 80743ffc07 am: 172d31f847
am: c21292127e

Change-Id: Iac008022e596a908f125f2a8a0ce57697cc65b51