Service status fix

Change-Id: I14600265c968a45664c5941d6132498488875146
Merge "Service status fix"