am c2af86ff: am 70cd92ca: am 27ad6a99: Merge "Improve calibration and accouting in flush-finish tests" into mnc-dev

* commit 'c2af86ff4367cbc17561d3620cefbcb1302cf8b7':
  Improve calibration and accouting in flush-finish tests