[automerger skipped] Merge "Add static IpClient logging" am: 3f966e9c62
am: 946050d3fd  -s ours

Change-Id: If8e8dc57346e315462c4a6ff020f7dee16115d76
tree: f79ff780b8d468eb7f7cabe279f4176263eb5cf7
  1. core/
  2. services/
  3. tests/