device updates

Change-Id: Ife6652656b3d5ac3ed688caa0826af7277a61156