Merge "Revert "Implement addAuthToken method of IKeystoreAuthorization ...""