Merge "Load internal resources using name rather than ID" into oc-dr1-dev am: 43e249ff27
am: f4d873fd56

Change-Id: If4b688989d8f7c0da73e32a98a9ebba619c53397