This reverts commit 3f7839cad0.
Reason for revert: This fix will cause a side effect which makes app switch state from Unrestricted to Optimize then it will lock at Optimize mode only, will prepare other cl to fix the previous issue
Change-Id: Ic5232eb0099fa1591f15e72747eca4d08b9af9b9