Merge "Make strict mode not triggered while connecting UDP socket"
am: 3ed4b09d71

Change-Id: I727f7fc8a13f0d41ce91617a82c0c1cc37cd8e2a