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

Change-Id: Ifd5116c2d8e44d6f16d6abd76d41fe5aebb28a24