Merge "Inject log group mapping into ProtoLogImpl generated classes" into main