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

Change-Id: I275eac1a47a6a925730d6aa80af80791f8f4b3ac