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

Change-Id: Ibb2e554cffe4d2a114548ed44910f8267b20b2de