Exchange support for rework of security policy code

Change-Id: I457568f648a73a2ac97216b621fb6357248f2fdf
5 files changed