swob refactors needed for sos

Change-Id: I839c2af9e524f712e6fbeb8bf74d860af1d243e2
Merge "swob refactors needed for sos"