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

Change-Id: If6738b557f6fef06559227583df63c715b711ffa