Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev