Merge "Fix edge case when applying id3 unsynchronization" into lmp-dev am: 4c75797abd am: fea0a3bb6d am: f15220d4fc am: 7bccf8fae9 am: 31a2855f12 am: 46bc5d4f0b am: d65e5d3c22 am: 72748f4ee4 am: 6c73780bfe am: be5bb00900 am: 1924e48be2 am: e2e9ff9da0 am: 80cae0a651 am: a307668b1a
am: cdecce1475

Change-Id: I658d51528286ca79dbd457ec2b8fa90db63fbf23