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