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

Change-Id: I3da4f43fbc4f2b6825372e9e5ae5e822fc4461ae