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

Change-Id: I7d7058f24a32bbcaf06d6157f5751f223598fdc8