Merge changes from topic "am-b4c20c17-d3c6-4a60-8bbc-1856c0a225e7" into nyc-mr1-dev
* changes:
[automerger] Support for build prop collection in STS for APFE integration am: d2b2aa35 am: fd8e14ff
[automerger] Support for build prop collection in STS for APFE integration am: d2b2aa35
Support for build prop collection in STS for APFE integration