Merge "Switch to a single PacketSocketAddress constructor" am: 2d24f7a39e am: a357696c2f
am: 9ec43cc7fe

Change-Id: Id17253fbe7d22117dff5766ce5b50b4e446e5090