Don't crash in CP2 if country detector is null

Bug: 10539498
Change-Id: Ic094e472e5a567e1dc6be4cbd14c02938df1de47
1 file changed