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

Change-Id: I0219d934fbae05e06d9187ad9e93529885019fe2