am 1509765f: am e680491e: am 1efe46de: Merge "Fix id3 parser crash"

* commit '1509765f2262e4582cdcfdb064417884a3efa04c':
  Fix id3 parser crash