Move datavalue parsing to ApiBasedValueParser

Change-Id: I263d7efedf6bc21b8ae888fed5a48d2729c40de2
Merge "Move datavalue parsing to ApiBasedValueParser"