Merge "Fix resource warnings." am: 63d3dfc2c7
am: a755e7971e

Change-Id: I640eb204533c4852253f4f0d2ef06c0b100f1738