Merge "Merge "Revert "Remove a misleading "flush" function."" am: 9fcf8b7cae am: 783313acbf am: 013c618a41 am: b2a36aefa9" into qt-qpr1-dev-plus-aosp
am: 6399a34a4d

Change-Id: I72fcccb65b8ac0eee37ea7fedb5aa6a10fab23bc