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

Change-Id: I22f8e18c57cd96ca9d7b0b274a40aa34d34bfea3