Merge "Merge "Removing legacy default thumbnail logic." into oc-dev am: a0e44e7335 am: fc926a938e" into oc-dr1-dev-plus-aosp