Merge "Add HW_AUTH_TOKEN_VERSION constant"