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

Change-Id: Ia50b68c8dfa8618218d64f0947863e3db329897c