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

Change-Id: Ib3b4ca9a5ae46735e0262a1e36c136ce3e57defe