Merge "Avoid duplicate carrier config change bcast." into mnc-dev