Remove lights flag

Change-Id: Ia5ed1518f1f7d8144691fb97319f727a675e094f
Merge branch 'cm-11.0' into martincz