Merge "Add error logging for softap commands" into nyc-dev