[automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42 am: 136be01dd9

Change-Id: I0f46525490197d3b4c03e1369c6a76ef0975329b