Merge \"media: Optimize thumbnail extraction.\" into nyc-mr1-dev
am: 88bd73d9ac

Change-Id: I775751f4ceec359cee8edce04d71482f0cfa6ae0