Merge "Merge "Fix linter errors in IpServer and its dependencies" am: a9be76c3 am: 4adb05b6 am: c922a838"