fix userdata size

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