[automerger skipped] Merge "Fixed incorrect merge service state" am:...

[automerger skipped] Merge "Fixed incorrect merge service state" am: 30b14a9d am: fbcd5586 am: 0ee8d6b3 -s ours
am: 9c95bd32 -s ours
am skip reason: change_id Ic18934adb870a0114c913855cdb68e0ef33caa79 with SHA1 5e640ac8 is in history

Change-Id: Ic8a9e57ca3e2054b0aae78bfff3bfdd1c887894d