Merge "[automerger skipped] Merge "Add static IpClient logging" am: 8285261133 am: d81625a7a9  -s ours" into pi-dev-plus-aosp
am: 3140998fed  -s ours

Change-Id: I88ce48c5842a6a3da50aa86341d21e4566194e2e