Updated device manifests

Change-Id: I9cdd46adb23465259b6ea88461b8fb065cf92066