[automerger skipped] Fix an issue in TrackRecord. am: 768d586c am:...
[automerger skipped] Fix an issue in TrackRecord. am: 768d586c am: 9b2ec350 am: 3ac07155 am: fae18e8e -s ours am: 1e84b6e6 -s ours
am skip reason: Change-Id Ie9eb4d7158e9583d4052e86f87062e3032b023e3 with SHA-1 768d586c is in history
Change-Id: I48762fa2ed1e720acdf1b6590ce4b55ab97a331a