sync STK

Change-Id: I940130955cb63045847cb2c4499cfb0edd1ca8b7