Move settings

Change-Id: I13dee12f89f22f3cee8ce4bc496fe3530413570b
Merge "Move settings" into pac-4.4