Merge "Add utility method to perform HMAC agreement" into pi-dev