Specify primary storage

Change-Id: I67cb31b37b80f1586dc7735479c87b3f96db64bf