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

Change-Id: Ia4d813bb0fae1a9f81f46d85887039a510b7568a