Fixup storage paths

Change-Id: Icfc1dff63785815e4217d724d5e5515c473d24e8
Merge "Fixup storage paths" into cm-10.2