Framework:  Fix security exception

Change-Id: I4fa1f55c8209e6890b6cea13b0ed4d781f9f615d
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1