Merge "Fixed incorrect merge service state"
am: 30b14a9d70

Change-Id: I2e9c8c15b0b224ebdff1d8bec2fa63721558ecd6