am b3a69c5d: Merge "Fix NPE in CallerInfo.getCurrentCountryIso()." into klp-dev

* commit 'b3a69c5dc3ee39cfb2a06660f0953c4c7b55d21a':
  Fix NPE in CallerInfo.getCurrentCountryIso().