Merge "Ensure that the thumbnail path is valid even without a thumbnail." into...
Merge "Ensure that the thumbnail path is valid even without a thumbnail." into oc-mr1-dev am: 1b8e47ae
am: cdd661f5
Change-Id: I4975ceba258cda5015a6ee5574f741fe506df959