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

Change-Id: If732481d7a5f8122e5a75b1aa692f7065bc69b54