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

Change-Id: Id780ff2bfb2f3881cbf33032971ed3b397a2fcde