Merge "API clean-up around PacketSocketAddress" am: f187497e24
am: 62f4acae5c

Change-Id: Idc40a5dbe1492453ed0710eaca4b9ebbff74ec8d