Merge \"Support visual voicemail legacy mode\" into nyc-mr1-dev
am: c16b7600a6

Change-Id: Iafe55c02ec3e089dfb08a1fe009867bb5299ae0a