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

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