am e45796de: am dedc7b0f: Merge "Fix flush() followed by start()" into klp-dev

* commit 'e45796dee9c072cdb13a00b407e68be2cd55e2f2':
  Fix flush() followed by start()