Fix: Fix for ambiguous and broken disk formatting dialog

Part of the original patch was lost in abbe71facf4cc00d1c947ec8f1606281ce51c67f

Change-Id: I5621dff3cfd12a173b0d793398cf729333f97263
Merge "Fix: Fix for ambiguous and broken disk formatting dialog" into cm-11.0