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

* commit '8d51c2f6fa628cc8f3e4d182df2dafdb7cbea48c':
  Fix CountryDetector NPE