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

Change-Id: Id21d01f146febdc4f156c4a8c0f439e21301d3a9