Merge "Add usd_defaults target to the supplicant build file." into main