Follow some of our own STE

Change-Id: I73a4e0c4d9573f440dec4baeb4c088602bc1b3c1