Add storage selection (1/2)

Patch Set 2 : Cleaned a few very minor things up.

Patch Set 3 : Fixed indentation.

Patch Set 4 : Changed how 'sStorage' is accessed, it is now a private static member.

Patch Set 5/6 : Fixed indentation. (yet again...)

Change-Id: I3a86a4698d07cede8f93f5fbd8f92b9464d82b90
fix cherry-pick Problem