am 66466087: Merge "Workaround for track recreation bug" into jb-mr1-dev

* commit '66466087f464b641c8c09b195891a9713a554900':
  Workaround for track recreation bug