Merge "Fixes update ownership preapproval flow" into udc-dev