Merge "Fix comments to reflect changes in eth service"
am: 1f392c468a

Change-Id: I542f43603ef19387c57b74cdadf0900548256c39