Add support for proximity settings

Change-Id: Ic76ca3c772eb4193f257ce392e7288c06f865c22