Merge "conman:  React to mwifiex firmware resets."