device updates

Change-Id: If610719bb159d31803e0acdabc55467a30118ee4