Merge "Add a Descrambler KeyToken validator"