Merge "Clarify UDP encapsulation socket API"
am: db1e624ee1

Change-Id: Ie1e7ea81440afee2618211d989989cf5daff3e1e
tree: d4b1396f202d8cda5ed5f7c48a9eb4d8cbc19bdc
  1. core/
  2. services/
  3. tests/