Handle reset of recommended services am: fe789f3189 am: bc11f26a09
am: 36d68891a5

Change-Id: I13f55cee79c6117f95c9fe8b268b64c654af90a0