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

Change-Id: Iefc31747aa3e762eeb7f7812241220915ef7c1b7