[automerger skipped] Fix an issue in TrackRecord. am: 768d586c -s ours am:...
[automerger skipped] Fix an issue in TrackRecord. am: 768d586c -s ours am: 4da8c0fe -s ours am: 7ceccc2c -s ours
am skip reason: Change-Id Ie9eb4d7158e9583d4052e86f87062e3032b023e3 with SHA-1 768d586c is in history
Change-Id: I0498adfb501e115b97daa1f032c1b2af3484c2be