Merge "Revert "LightService: don't use implicit cast of Return<*>""