Merge "Make HW_AUTH_TOKEN_VERSION static"