Merge "Add null-check for subInfo.getCountryIso."
am: 0ebde2e4e3

Change-Id: Ia877527feedc11dd43214c901a8ae515916fefca