am 3ded7766: Merge "Ensure coherency of call kinds for LocationSummary."

* commit '3ded7766981b3105c7686e0c9d75c378c42fa4a0':
  Ensure coherency of call kinds for LocationSummary.