[automerger skipped] Merge "Fixed incorrect service state populated" am: 5f8b1bfe66 am: 3690c6d927 -s ours
am:c02c189aec-s ours am skip reason: change_id I7fab7090c22390914af024c44bffd643c13f33e5 with SHA19302618da6is in history Change-Id: Ib972dfdbab90c6ad745ba2cd7bbabc1611c7f174
This commit is contained in: