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

Change-Id: I4724c27872dc11eb53ed4561743a648ef87bf434