Merge "Change the validation URL for Chinese SIMs" am: 08d4a537ec
am: bea65fa482

Change-Id: I79f0c73f1a5c3edf64c347611555e00c3a9a6516