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

Change-Id: Ib5d396772eef78971a1c4750bebe72ba49fdaef2