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

Change-Id: I943ed77404e4cddae4db86ddad20282ce8e86b83