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

Change-Id: Iebf8660d698adefcc9989fed8dba45198abcd1e7