Merge "Allow factory reset in carrier demo mode"