Remove last reference to DataValueFactory

Change-Id: Ic486a5d9b6c31a7a30c7f00d2ec7f0b538cf7d37