Fix merged op clipping issue

Change-Id: I48cd5e92f3e62dcd189a4411a71aa7a40ce5498c
2 files changed