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

* commit '4eaca59766e4631ff9ab6a8648f2444252d7ff40':
  Fix CountryDetector NPE