Merge "Fix capitalized variable UserData"
am: c6f86d3403

Change-Id: I533903954beda7e999b24a216f4f21e717469a71