[automerger skipped] Merge "Fixed incorrect service state populated" am: 5f8b1bfe
am: 3690c6d9 -s ours
am skip reason: change_id I7fab7090c22390914af024c44bffd643c13f33e5 with SHA1 9302618d is in history
Change-Id: I613e97953a26bdfffb9a57652991edc7d69c5b21