Add storage selection (2/2)

Change-Id: I364c9fd43c48195248d374e2f441fad2280aa4de