m7: Set primary storage volume

Change-Id: I18d8df8470518fab6859effa19b50f4fa59d00ab
Merge branch 'cm-10.1' into martincz