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

Change-Id: I2d0567f03144b269379e85e96286ad4e0d6b86e3