Merge "Fix resource warnings." am: 63d3dfc2c7 am: a755e7971e am: 3d5dbb9d4c
am: b58a2e1dca

Change-Id: I796f561f71f3ec22a5e5f7e7072f0808f0826764