Merge "Increase gm precision from 16 to 32 bit ints" into nextgenv2