Merge "Add basic support for new suspend-block ioctls."