Factor out void block creation

Change-Id: I4a06ab215273f2212bfb4556b0e74a2f6f2e81d6
Merge "Factor out void block creation"