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

Change-Id: Icffd569b841ae913bd66efe97aac42a47a3e95ba