add in more devices

Change-Id: I804ca03614ccff4f0326d6e3a33235fdf9b27cec
Fix GPS

Change-Id: I30d20038f3a2c5b5f47f3f710fa7e1e5e0c091a5