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