Merge "Update local device info" into udc-dev