Merge "Make -so optional for better testability." am: 0b9c3e0a am: bb8f63f3 am: 45059cd7 am: e5970dda am: 6a1c4192 Change-Id: I48955e7f2025b3515e5f383b9c2f1a1a9f726f46