Set primary storage

Change-Id: I022cb57c392ff852d023a49d3974e4242c94718c
Merge branch 'cm-11.0' into martincz