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

Change-Id: I342a7e0a9b12d3ac575f397afb27e3372181d20c