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

Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48