am 6fb082ae: Merge "Make sure that the trackId starts from 1" into jb-mr1-dev

* commit '6fb082ae298a0c6028d540c099ae5a1838701bdd':
  Make sure that the trackId starts from 1