Re-enable DPI groups

Change-Id: Ic2aba81eb9a664f986ad56bdd51d8b4798a775d4