Merge "Populate some missing fields in TrackData" into rvc-dev am: 26e55eb8ab am: c55de45216

Change-Id: Id51acef4d5f46573f79b2c20cfe7f4e11ef277e2