Merge "Cleanup Call Settings initialization code." into lmp-mr1-dev