(4.4.3) Bypass security policy requirements (and now added test fixes).

Change-Id: I422c672eb2a79c2434e4542fff32a19c8dce9aee