Rebase external storage capability

Add external storage capability

Change-Id: I600d82528de2ef8192967d3802cdab3012840c30