am 24a9cb4e: am 5c0adc3e: Merge "Workaround static fast track start-after-stop issue" into mnc-dr-dev

* commit '24a9cb4e021c3c13b9aef544dc8aa6c4bc8f9d92':
  Workaround static fast track start-after-stop issue