Merge "Fix build warnings about resources." into oc-mr1-dev