Merge "Removing legacy default thumbnail logic." into oc-dev am: a0e44e7335
am: d6e3001770

Change-Id: I9b7572f08a3b67bf886aa06d02e00a960529aa9b