fix userdata size

Change-Id: Ic6ab08caa5236a6092e03275ad9911bd07b470e5
Merge branch 'remote' into mkl