Merge "Fix wrong userData length and excessive userData issues" am: 13d5d5a1c8 am: 487b123d6f
am: d6a3556d48

Change-Id: I2aba632a1b30bc553830bab269e990164a8f40fc