Merge "Removed userHandle from setXXX methods"