Merge changes from topic "presubmit-am-8d10f85b2c284afab94be3ffd6965825" into tm-dev

* changes:
  [automerged blank] DO NOT MERGE: Add stub class and filegroup for Ethernet service. 2p: 77f3dd80c2
  DO NOT MERGE: Add stub class and filegroup for Ethernet service.