Merge "Fix capitalized variable UserData" am: c6f86d3403
am: d4d2c2bec5

Change-Id: Ide405165a54f7268a621b7e0f4095ebe9cce252b