Rework external storage init

Change-Id: I73aecc4d6850fc684a857a42fceced7b3fd57aaa