Merge "Optimize visual voicemail activation" into nyc-mr1-dev