Merge "Remove a user/userdebug difference."