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

Change-Id: I2bfa25f16bfc25b6c4202e247ce0c73746c54366