Merge "Increase the timeout of wifi supplicant test" into oc-dev am: badf028a52
am: 2466a8fc7b

Change-Id: I68390d3fb942c380353b057817c6bd1b0799a76c