Remove the lights flag

Change-Id: I6af494dd44d8f058e0908da167e7d2529d455a81
Remove unused flag

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