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

Change-Id: I963cedb002267d8d3bf74f645d27b7fca3312368