Fix external storage

Change-Id: Ie966a7d6d7e825ac6207d4149e2f15f18a9da9f8