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

* commit '7258f5c542673834266f51503a931dfe43ea8a0d':
  Simplify call assistant setting