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

* commit 'bd96803bbca147a7d011bb9112bc414f470e1f89':
  Cleanup Call Settings initialization code.