Merge "DO NOT MERGE Allow STS to run CTS tests added in nyc-mr1." into nyc-mr1-dev
am: a63283f825

Change-Id: I67be543f6b813997567f909fef26692685d9f4ab