Merge "AppSecurityPermissions: minor code cleanup" into jb-mr2-dev