am 6ff8e03e: am ba6caa1c: Merge "Expose the SocketAddress variant to bundled apps."

* commit '6ff8e03ef67c204565ceb3679029a0b88bdfaa62':
  Expose the SocketAddress variant to bundled apps.