Merge "Fix build warnings about resources." into oc-mr1-dev
am: 64204a8302

Change-Id: I1f9e494256df9b97b1678d1aa69c0d0b345c5afb