Revert "Revert "Add storage selection (2/2)""

This reverts commit 27f80c30596362e2f9a3e2045068fdd6c2f9a168.
Merge remote-tracking branch 'upstream/cm-10.1' into testing