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

Change-Id: I669080586ea60b5abe0da5465fea4d952f737f1d