Merge "DeviceManager map key change"