Merge "DO NOT MERGE Initial STS commit, no test for now becuase L." into klp-dev
am: 66fc1834b7

Change-Id: I108854d2acace60ec8e22900afe964062cc4332d