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

Change-Id: Ic64ef2f8511ee6cd71c5cf2040c82129d2c2e182