Merge "Handle failure in softAp start gracefully" into rvc-dev