Merge "Fix lockup of '/COMMIT_MSG' file from patch set" into stable-2.4