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