Merge "Move HMAC agreement to vold" into pi-dev