DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538b7 am: c3819cfda9 am: c696d76d98  -s ours
am: 1e036d883e  -s ours

Change-Id: I72ef099cc16c44823320453729da9c036d7fdca8