Merge "Merge "Revert "Remove a misleading "flush" function."" am: 9fcf8b7c am: 783313ac am: 013c618a am: b2a36aef" into qt-qpr1-dev-plus-aosp