Merge "Fix can't turn off Google" into udc-dev