The debug configuration group is not registered

The debug option group is not properly registered, probably because of
in-properly solved merge conflict.

This change fixes it.

Change-Id: I0ebe0aee9ed11d70418827d504ee5e5fb05fd5d9
Merge "The debug configuration group is not registered"