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

Change-Id: Iff63e14e601d32e6991ad651b4dc0917be6c11e7