Merge "DO NOT MERGE: Include CTS security tests in the STS plan." into nyc-dev am: eadaacfee5 am: 083cc78d49 am: a4213b831d am: 72d8719255 am: f80dac128f  -s ours am: 6282f511f2 am: 8615392d93
am: 5cdc38f432

Change-Id: I113a99e411958119f0cea9162c3685953ebe3625