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

Change-Id: I35f3cff29470b5f8da8f7c5f773ce83b6d3498a0