Unbreak group selector in old interface

Change-Id: I24557a1bc46ff8f5c6f489ccfd7e19830ff9ed5f
Merge "Unbreak group selector in old interface"