device updates

Change-Id: If5145c269fbe48c5165f04cb3b4752f8809f1b2c