Merge "Optimize visual voicemail activation" into nyc-mr1-dev am: c0ebe60366
am: ad146ec033

Change-Id: Ie2d2651da7cb3bff1f9b539481718a797cec476a