Merge "Fixed incorrect service state populated"