Merge "Revert "Revert "Remove a misleading "flush" function.""" am: d9bce3cf am: 80743ffc am: 172d31f8 am: c2129212 Change-Id: Iac008022e596a908f125f2a8a0ce57697cc65b51