Merge "Remove RetailDemoModeServiceInternal" into oc-mr1-dev