Merge "Revert "Revert "Resource ID fixup.""" into oc-dev
am: a11196074b

Change-Id: I1ea7b4a17bf7ba6de43db52e996aff4c56dc3bf0