Merge commit 'da6818d3785571964bb5bdedf7afa18900deb9ea' into eclair-mr2-plus-aosp * commit 'da6818d3785571964bb5bdedf7afa18900deb9ea': Update lights to support the change in parameters passed by the framework