Merge "RESTRICT AUTOMERGE: Fix Securty Test Annotations" into nyc-dev