Merge "Don't set ro.carrier in init.c"