Try to avoid group name conflicts.

Change-Id: Ie6910dafc46f89f6451f38d6bec9bb06c3e5f20b