Change Details

Unrevert the change that cleaned up namespace imports and backport latest univalue version per prior commit. This change also fixes the test data that broke as a result.

Backport latest univalue version to fix minor bugs and cleanup namespaces. This change also fixes the test data that broke from the previously reverted change.

Unrevert the change that cleaned up namespace imports and backport latest univalue version per prior commit. Backport latest univalue version to fix minor bugs and cleanup namespaces. This change also fixes the test data that broke as a resultfrom the previously reverted change.