Merge changes Ieabf61aa,Ib566e3f3

* changes:
  3/n: Start adding plumbing for some HAL callbacks
  2/n: Add HardwareAuthTokenUtils