Merge "Remove a misleading "flush" function." am: d6f04e744d
am: 932b360d45

Change-Id: I8aae42ce0d01aabefa73621aab5c052557ff1946