Merge "Fix appsecurity tests." into ics-mr1