Merge "Add dirgroup for trusty genrule" into main