Merge "Updating light service for hidl."