Merge "Fix linter errors in IpServer and its dependencies" am: a9be76c393
am: 4adb05b6b0

Change-Id: Ie3d6285fa7da96fee10028b38aa6c5a8d5c85c48