Merge "Add needed copy for HC privacy integration" into udc-dev