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

Change-Id: Ifa239877c607468fe4ca9bdb87f712b10633762b