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

Change-Id: I7e8a7bbb22421d43589fa902a053e1dde0add9ab