Add getDataValueFactory to top level factory

Change-Id: I9a8491d4b7ef81e80facabb54c96db28b8c5d813
Merge "Add getDataValueFactory to top level factory"