Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev