Merge "RESTRICT AUTOMERGE Log to detect usage of whitelistToken when sending non-PI target" into udc-dev