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

Change-Id: I196fe22ce901383f3349b99823f066d1226fa4fb