Merge "Fixed a strict mode violation in voicemail/calllog provider."