make loading assets more robust

Change-Id: I9a2b7be8e8522264f8f2de04b43dbe5ec98bc24a
4 files changed