[automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42 am: 136be01dd9 am: c0367b9433 am: 27d756fbae am: 6801c15049 am: 71e28ba226 am: 1a7bebd207 am: a30a421cc6

Change-Id: Ie2af67588637d1869bdcb227769e22cbce1bed80