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

Change-Id: Ic9bb222a9b3090ef48b2477dc7dcd6a7c93348e6