Merge changes from topic "presubmit-am-2fdbe572af844efa80b9758765138692" into tm-mainline-prod

* changes:
  [automerge] SF: Introduce LayerTraceGenerator 2p: 4df8eb6269
  SF: Introduce LayerTraceGenerator