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

Change-Id: Ide407c6ccc5a42c9a57acb1652b19db99bee42a8