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

Change-Id: I0acac224b4fdd724d1ba0f7ce85808f5e02c9749