Merge "Support visual voicemail legacy mode" into nyc-mr1-dev