experimental fix for storage on AOSPA