2479: discard any existing disk layout

Change-Id: I3fdb5f7612d0408ca755b5c455d0cdd43e4a1174
Merge "2479: discard any existing disk layout"