Merge "Do not use hidden putIntForUser"