Merge "Refactor CountryDetectorService" into qt-qpr1-dev am: 7d26587263

Change-Id: I45efb245c646105874bc97bed57c6d36bbbcc979