Get correct path in new SDK19 storage manager

Change-Id: Id25a3c80d587c1d1b8967a1eeeb4354e0d228089
Merge "Get correct path in new SDK19 storage manager" into kitkat