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

Change-Id: Icd583aced1fd57444a5194db9ba2644f9862d1a9