am 38743cf8: am 77b812e7: Merge "Cannot swap active and background calls after...
am 38743cf8: am 77b812e7: Merge "Cannot swap active and background calls after failing to merge." into lmp-mr1-dev
* commit '38743cf8':
Cannot swap active and background calls after failing to merge.