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

Change-Id: If3d2834303dfd76dc504af84f4f7ea8fd3b2a8ca