Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread