[automerger skipped] Merge "Fix comments to reflect changes in eth service" am: 1f392c468a
am: 967ee98726  -s ours

Change-Id: Ia330744195e2e4ac9182b762ae3c89c1602d3727