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 am: 955d03d798
am: 0806da1ab5

Change-Id: If14d917a13d47081c5139411295e0703b3cacd38