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

Change-Id: I2cd495b5437b1e66fc30101700d58515509bef3b