Merge "Tweak visual voicemail" into nyc-mr1-dev