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

Change-Id: I571000265b17a38133795c6e55571318da3ade5d