update stweaks from dorimanx

Change-Id: I4d4947a264b8231572753cc000a4968c8a865312
update stweaks

Change-Id: Ic37fddf85876a2a1b1b4429cd2adb0969c1e3647