Patch base for STE

Change-Id: Iffc55be723fb7a6a06453d6a4b4ab2473e619e03