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

Merge "Fix edge case when applying id3 unsynchronization" into lmp-dev am: 4c75797a am: fea0a3bb am: f15220d4 am: 7bccf8fa am: 31a2855f am: 46bc5d4f am: d65e5d3c am: 72748f4e am: 6c73780b am: be5bb009 am: 1924e48b am: e2e9ff9d am: 80cae0a6 am: a307668b
am: cdecce14

Change-Id: I658d51528286ca79dbd457ec2b8fa90db63fbf23