Merge "Handle reset of recommended services" into nyc-mr1-dev