Merge "hw_auth_token: make timestamp 64 bits"