Merge "Make -so optional for better testability."
am: 0b9c3e0a3a

Change-Id: Ic92e6105bbcae36658475efebb28eb95606b2a74