[automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42 am: 136be01dd9 am: c0367b9433 am: 27d756fbae am: 6801c15049

Change-Id: Ib6be75c9ec42de4990778c4809fa43a1753aeb93