Merge "Update owner under multi-user scenarios" into udc-dev