Fix problem with reloading config of new devices with same card/device numbers.

Bug 16981885

Change-Id: I65c6c418ee0d0f42c87379b614f64302d27f8e77
2 files changed