Merge "Fix inconsistency in gm parameter write to bitstream" into nextgenv2