Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546 am: c7fed42403
am: 6284825f22

Change-Id: I4995070433e9f35a30e47aaf7045eeb14d31dc5b