Move device-specific settings to Galaxys2

Change-Id: I86d856fccd11d082f70eb37fe5e3d084c54574fc