Merge "Remove the legacy endusershell/getusershell/setusershell stubs."