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

* commit '5c0adc3e632fbb2929cb20e32a8a9f2864c01490':
  Workaround static fast track start-after-stop issue