Merge "DO NOT MERGE initial add sts to build" into nyc-dev am: b20486d397 am: 41a57745a4
am: 5a37ad8d6b

Change-Id: I79b340558af4720e32c12dba4e4712bb722b89cd