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

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