Merge "Framework: Shake to Temporarily Secure && Fixes(1/2)" into pac-4.4

Change-Id: I9cece92defc89cc169bb2eea87f3f76d07b0d6a0