[automerger skipped] Merge "Add static IpClient logging" am: 8285261133
am: d81625a7a9  -s ours

Change-Id: If8e8dc57346e315462c4a6ff020f7dee16115d76