Re-enable LED configs

Change-Id: Iee8b30534bc0f3fb4f81b8e276dd0ac336615c68
Merge remote-tracking branch 'cm/cm-12.0' into HEAD