[automerger skipped] Rename Light to LogicalLight to avoid namespace conflicts when adding am: b19593a5c3 am: b500354545 am: 7cb841c9a8 -s ours
am skip reason: Change-Id Id5f7bfc74cef6d584c42712fcbea816e456b8b2d with SHA-1 f773e10a99 is in history

Change-Id: I7744f71cdc85df03644cb7a293e9c0537bd7d9ac