Merge "Re-enable RetailDemoModeServiceTest."