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

Change-Id: I0a82ed1cad24a9f7bd5c23863c6b7c85319cf254