Merge "Add UID in AppInfo." into udc-dev