Merge "Add voicemail backup/restore columns" into nyc-mr2-dev
am: eb063d5cf7

Change-Id: I056bc597c9239107eb097248c1d2c40294d00dfd