Merge "Plumb through physical device UUID and label." into klp-dev