Protecting against NPE with null country detector.

bug:10514454
Change-Id: I316c47eddbe4929599866a3f9da9129d0056e3e2
1 file changed