Merge change 20668

* changes:
  Print restore tokens in hex