Merge "Add Eric to trunk staging OWNERS" into main