Merge "SoftAVCEnc: Modified the code for runtime change in params to be generic" into nyc-dev