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

* commit '0f476935fe6ffa3715559b546cb5c1d79040d080':
  Simplify call assistant setting