Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev