am fce5c3d6: am 4e3cdf85: Merge change 23619 into eclair

Merge commit 'fce5c3d6eefef9ab4d563721c39704842ce96bf4'

* commit 'fce5c3d6eefef9ab4d563721c39704842ce96bf4':
  Add automatic lighting control framework