Merge "Fix crash when loading resources without code" into pi-dev
am: c46279aa98

Change-Id: I3af4a66f050380c507ec59b9136f2ef6a4f41848