Merge "Loosen resource file verification" into pi-dev
am: cf0b127110

Change-Id: I0b4012085579aa172a1a3f5a83325f0827523af5