Merge "Try to temporarily disable RetailDemoModeServiceTest"