am addca877: am 7258f5c5: Merge "Simplify call assistant setting" into lmp-mr1-dev

* commit 'addca877e8816de9a01b2c9114113b296e7c21bc':
  Simplify call assistant setting