Minor fixes after securitymgr line up.

Change-Id: Ia628ebf98d01593a99edee9e971ba1f75afd4e4f
Signed-off-by: Meggan Ehret <meggan@qeo.org>