[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 skip reason: Change-Id Ie9eb4d7158e9583d4052e86f87062e3032b023e3 with SHA-1 768d586c is in history
Change-Id: I017265e4aa0aa2eba11b21a0cc3bbb95edc94e5d