Merge "Merge "DO NOT MERGE initial add sts to build" into nyc-dev am: b20486d397 am: 41a57745a4 am: 5a37ad8d6b am: cf5f702e19 am: 5da13164a3  -s ours am: 83c569775c am: 49505afe45 am: 17abc3a4e4" into oc-mr1-dev-plus-aosp