Merge "Disable visual voicemail service on secondary user" into nyc-mr1-dev