Adjustments due to implementation of ValueParserFactory

Change-Id: I715d4a88beb117a62a8a4128706d9aa5b29a2941
Merge "Adjustments due to implementation of ValueParserFactory"