Merge "Make sure that the trackId starts from 1" into jb-mr1-dev