Don't ignore spaces in Device UIDs
(cherry picked from commit bb1d5e458a974a55de36f0621557d410d0e915f3)