Merge "Reset invalid selected countries to the default value." am: 5eac337bda
am: 04f1c1a0e6

Change-Id: I7fbbb356bc7426f6f03dffb6178fd1e363cc09f5