Merge "Revert "Remove a misleading "flush" function."" am: 9fcf8b7cae am: 783313acbf am: 013c618a41
am: b2a36aefa9

Change-Id: I36c6e6b46d7934d142e087d90288c71d2cbd2e87