DO NOT MERGE: defensive parsing of mp3 album art information am: fa0806b594 am: 1e9c67e52b am: e78bb7ab20 am: 830fbba76a
am: fd8fd049b5

Change-Id: If56540bdecdf06680dbbdc70054aadea63e94389