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

Change-Id: Ibb93bfb64c994170c8fd636bc0b4d55806908482