am 3e33d5a7: am 8d51c2f6: Merge "Fix CountryDetector NPE" into klp-dev

* commit '3e33d5a769885dcd7f19f386f165810881e22c16':
  Fix CountryDetector NPE