Merge "fix security tests build" into lmp-mr1-dev