Revert "Revert "n5100: fix internal storage""

This reverts commit 4ca433e36a74c93b34ecf66fbb5bad5dfd55deea.

Change-Id: Ib75ba7185f10d35fc054b09f20d6f7534965dc48