Merge "[RESTRICT AUTOMERGE] Revert "Don't force +1 for resource resolution."" into udc-dev