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

Change-Id: I84defa9bfb4a90f97834f59e0c221bb99668c2b9