Merge "Improve caching behavior of thumbnails" into oc-dev
am: b67e105e74

Change-Id: I48914589de80ca11c97919bb5af6903ae46d2b3f