Merge "Ensure that the thumbnail path is valid even without a thumbnail." into oc-mr1-dev
am: 1b8e47aebf

Change-Id: I9f08d7cb640f132fa765b899fbfea5d5f2ee3ea4