Merge "wifi(implementation): Increase stop timeout" into oc-mr1-dev am: 558d53cc61
am: b537ec5d6f

Change-Id: I6e9a1f36d85b9e9f421873e79e5df9214bf053a0