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

Change-Id: Ieb6b57e801061463c70d4b2ccdbfe7ff2dae2f5e