DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538...
DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538 am: c3819cfd am: c696d76d -s ours am: 1e036d88 -s ours am: 8326a5bd
am: c7bbcd1b -s ours
Change-Id: Ic4cdb51567e719b1c44788f8e688df3e55797c56