Merge "DO NOT MERGE Initial STS commit, no test for now becuase L." into klp-dev am: 66fc1834b7 am: e3efa97d33 am: fe0e7ddd6b  -s ours am: dccfed23e6  -s ours am: d887b29e68 am: 3e29208599  -s ours am: a186b9fb09 am: c83ab4d7fa am: b1163c21f4 am: 86e17ec2e4  -s ours
am: a1cb97cee7

Change-Id: Ibc90f825aa3578ec1b73e3cb9841c8b81c807afe