Add more devices

Change-Id: I2c50f050ed83debdd5e8bd9c9d218a843eb3063c
Merge "Add more devices" into kitkat