DO NOT MERGE initial add sts to build

Bug: 67456333
Change-Id: Ieea499fc22b6dff87dfb19fb8b9446fa449152ea
2 files changed