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

* commit '3591bebd5957a8547fc54659179a19440636e7f9':
  Restore Wi-Fi configuration after the test. DO NOT MERGE