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

Change-Id: Ibb21bff953a35d07c78ff26678ea2c173eb15560