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

Change-Id: I64182cb9abd3ae64a906b406168024e8cfb566e9