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

Change-Id: I15f51c0f17789a4066231d59dc206038cec2c646