Merge "Fix comments to reflect changes in eth service" into pi-dev