Merge "Merge "Fix comments to reflect changes in eth service" into pi-dev am: 44f71470" into pi-dev-plus-aosp