Fixes disks Load Defaults

Closes-Bug: #1255548

Change-Id: I5db83069a4a92075d191ed13bee6fe08376ee803
Merge "Fixes disks Load Defaults"