DO NOT MERGE: defensive parsing of mp3 album art information am: 21f2814260 am: b820fe865a am: a064916d90
am: c63bbf90f9  -s ours

Change-Id: Ia6bd31e33a59ae83b44e124349eb18531f495d10