Merge "Add support for overrideable boot user id"