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

Change-Id: I23eeff8ab3dfd281585ef4650a6f036b6c80f4f9