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

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