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

Change-Id: Iebaf8a4f5902e3751502809181d0efde7dff7ba5