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

Change-Id: I3f6b21703b00a4189cca15de7d572cd3bf0d17bb