Merge "Allow override own number as voicemail number for GSM" into pi-dev