Merge "Fix edge case when applying id3 unsynchronization" into lmp-dev am: 4c75797abd am: fea0a3bb6d am: f15220d4fc am: 7bccf8fae9 am: 31a2855f12
am: 46bc5d4f0b

Change-Id: I9837baee1d8f14d9e6803ec5ee627bb0ed7b44c2