am 9c967e6c: am 1677b409: Merge "Create new ID3v2 metadata test, take 2"

* commit '9c967e6cc11763babea5056826483d781fbc3a2b':
  Create new ID3v2 metadata test, take 2