DO NOT MERGE: defensive parsing of mp3 album art information am: fa0806b594
am: 1e9c67e52b

Change-Id: I300f325425636e30cf844b8fad13078c78ef827f