Merge "Clarify UDP encapsulation socket API" am: db1e624ee1
am: bdc59ca370

Change-Id: I5fcf79691c670e710e46b3a9eac8a580c44028fb
tree: a0b633f61341c75e3eac3730ffa7b049b8cb7def
  1. core/
  2. services/
  3. tests/