am 3982a906: resolved conflicts for merge of 67d3ba11 to jb-mr1-dev

* commit '3982a90600fbe76c770acc63da1afd77820b254a':
  Removing code to handle "call" action from QSB suggestion