Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev