Change Device ID

Change-Id: I9df8879a5664b9bcff3fd737b118187fc87f846d