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

Change-Id: I96b5809d777705bc1b1c206a71e4d7a570022a6a