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

Change-Id: I806ac9ce69cada0a26e481bd121742ddbcf6f4b0