Merge "Remove a misleading "flush" function." am: d6f04e74 am: 932b360d am: ceeadec8 am: 84297636 am: eb699b5d Change-Id: I64182cb9abd3ae64a906b406168024e8cfb566e9