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

Change-Id: I39c832f1ff5b0905bb497c3970c4ce40dad237b8