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

Change-Id: I79122e5bf263ebe54edd8a55f89f1c2f985a7029