Merge "RESTRICT AUTOMERGE: Update security testplan runtimes." into nyc-dev