DO NOT MERGE: defensive parsing of mp3 album art information am: 52d02b97a4  -s ours am: d4bce2cc70 am: 64e37f54f5  -s ours am: 5aa1034968 am: c20fe545fc am: ae44650731
am: 572c3ddcc9  -s ours

Change-Id: I2b906e488bc73bd27f6160b858c0489d8f64ecea