device updates

Change-Id: Ide32bb44fd9ea94622d08ad42d366bba76921312