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

Change-Id: I5bef9526645613549448022b0c79e832493854d0