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

Change-Id: I4f3f8f6e600a6902766e9075cfc9aa4cff61d930