Merge "Made VoicemailContract classes non-instantiable."