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

Change-Id: I0e166c11ac2b1598b196d85306fd2827d643dc04