Merge "Add comments for visual voicemail short codes in whitelist." into mnc-dev