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

Change-Id: Ia0b15a94c5a9d23afce3bf5841619d0f4d1a54b5