Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread