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

Change-Id: Ie5e2b1f88df5ac8d9c8a46a9ddf764d640cf5ddd