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

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