Merge "Fix resource warnings."
am: 63d3dfc2c7

Change-Id: I18436f2834788c917d68dd66600a95ec78527c6d