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

Change-Id: I7dcba4aa48cb77253771b75ce78eb777cbab79d8