Merge "Fix edge case when applying id3 unsynchronization" into lmp-dev am: 4c75797abd
am: fea0a3bb6d

Change-Id: I742c7ac17992fb59aeeeecadff6c798b55344cc5