(cherry picked from commit 68178096c65de75036508e47b965043bed33d4a1) Excluding treewide renaming of this package.