Summary: back out sa-related changes to 6652736, use concrete expressions for WKK names in the SA
Reviewed-by: never, sundar