Merge "Fixed incorrect service state populated" into qt-dev am: 9f0eb916f3
am: 12ae30d843

Change-Id: I2addc60739d5ef24ebf243e303d3fe7896e268de