Merge "Make parameters parser-implementation independent" into rvc-dev am: 6beb092933

Change-Id: I0aed3f59a21be8649e3e2b543dfe52e9bef63adc