Merge "Remove RetailDemoModeService" into oc-mr1-dev