Merge "Inject log group mapping into ProtoLogImpl generated classes" into 24D1-dev