Revert "Rollback decision to merge by package name"

This reverts commit ca542c90cd2506daf1c4de72f34de940c8128d76.

Reason for revert: product changed mind

Change-Id: Ic4b9275e8f19bf2b3e3e51f09162fb6d45e6a5bf
2 files changed