Merge \\"Disable visual voicemail service on secondary user\\" into nyc-mr1-dev am: deefacc839
am: aa7836b4f7

Change-Id: I7718d4d7489c28218a791dd6e3366b9e3cc63354