Merge "Fix complex clipping on mergeable ops DO NOT MERGE am: d183e0b988 am: a6bfd8d12c am: dfe4a1b6ee  -s ours"