Revert "Revert "Resource ID fixup.""

This reverts commit 30de4cff12dfcf0c2b54a5950db40b8f7e873de2.

Bug: 37480230
Test: build
Change-Id: I2884d10835ac7c99a6e2ab8756354847138b7a82
4 files changed