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

Change-Id: Ibec9a5458779e46a118d6113d8382e4c12e37f4b