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

Change-Id: I909d950367570f907b87adf1740c3d6c1f6ed94a