am 8705f034: (-s ours) Merge "DO NOT MERGE Fix potential mismatched caller information" into ub-contactsdialer-a-dev

* commit '8705f0344c1bb1f626b03114c5996b334cc44564':
  DO NOT MERGE Fix potential mismatched caller information