am 69c11987: Merge "Make lighting style and attribute public" into lmp-dev

* commit '69c11987af933d4f731b707e3d46b207b4e11f0b':
  Make lighting style and attribute public