DO NOT MERGE: defensive parsing of mp3 album art information am: fa0806b594 am: 1e9c67e52b am: e78bb7ab20 am: 830fbba76a am: fd8fd049b5
am: 2f09cc743f  -s ours

Change-Id: I28ef8c906583dd6654e2b808bee459fcb893b169