Merge "Add connectivity unit tests to test_defs.xml" into gingerbread