Re-organize Devices Added Devices ID

Change-Id: I90676388f0e58c1bfafb3a70276f13aa14b48960