Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev