Merge "Revert "Reset system fixed to clean storage perm model 2"" into qt-dev am: 901516cb6c
am: ab0c747d65

Change-Id: I9a79c7454501a75d88af0d37866bda74db76e27b