Merge "fix oem_XXXX ids to incorporate both ranges"