Merge "Cleanup TwilightService" into nyc-mr1-dev