Merge "Improve documentation for EXTRA_ROLE_HOLDER_STATE"