Move settings

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