Merge "Add flush test" into oc-mr1-dev
am: f213eca917

Change-Id: I3dd0c6afa135d5624bbb86b0c651a2eed22bb276