TeleService: Settings clean up

Change-Id: Ib087fd83db6f881fac2deb0912a6522bd1f52799
Merge "TeleService: Settings clean up" into pac-4.4