Some SDDOS fixes to not rely on sectors being sequential

Change-Id: I371a9dd8fbd28dacb3d28ce2eeeda7e0847da0de