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

Change-Id: I6a52e5876669304223902c341c9950d843185c7a