DO NOT MERGE Initial STS commit, no test for now becuase L. am: 8cf4d5dbdb am: f3d73f60a8  -s ours am: 3fedf361ad
am: 29323aa700

Change-Id: I21c598a456631d400145f8f30bfefc109701f509