am 9e4985e8: am 845ffcea: Merge "hw_auth_token: make timestamp 64 bits"

* commit '9e4985e8cb40e6e53a01a1080c210c0c09be305f':
  hw_auth_token: make timestamp 64 bits