Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288
am: db258ebba8

Change-Id: Ic9821f05d30a57fad1567e834804cec6ff5dca97