Merge "Fix pep8 violations in ArpHandler"