Address ENG-9691.
Depends on D14072
Called the function manually for users with signed and unsigned device lists. Also tested in child diffs.
Missed the fixup commit
nit: IMO better