Merge "Map WRITE_SECURITY_LOG permission to gid" into tm-dev