Merge \\"Cleanup TwilightService\\" into nyc-mr1-dev am: e5aeca3dc9
am: 6c02076e73

Change-Id: Ib3aad9f409c01338ce9be5d433db55d87d511daf