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